diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-05 19:16:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-05 19:16:08 +0200 |
| commit | 0f1b7c9f31c0d33dc18cd17a82cf692919eb0991 (patch) | |
| tree | 67331067465195ce148cf81ce5445aa6fea6a844 | |
| parent | 78d196764e9bb85a14f4d868930071521ce6513e (diff) | |
| parent | 2c864df3093c1f6abfdab577a378d9cff7dcc320 (diff) | |
| download | Chimère - projet de référence-0f1b7c9f31c0d33dc18cd17a82cf692919eb0991.tar.bz2 Chimère - projet de référence-0f1b7c9f31c0d33dc18cd17a82cf692919eb0991.zip | |
Merge branch 'v2.2' into carteouverte
| -rw-r--r-- | templates/chimere/blocks/news.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/chimere/blocks/news.html b/templates/chimere/blocks/news.html index 68b0836..b622ef0 100644 --- a/templates/chimere/blocks/news.html +++ b/templates/chimere/blocks/news.html @@ -31,7 +31,7 @@ $(function(){ <h3>{{news.title}} – {{ news.date }}</h3> <p>{{news.content|safe}}</p> {% else %} - <h3>{{news.name}} – {{ news.start_date }}{% if news.end_date %} - {{ news.end_date }}{% endif %}</h3> + <h3>{{news.name}} – {{ news.start_date }}{% if news.end_date and news.end_date != news.start_date %} – {{ news.end_date }}{% endif %}</h3> {% if news.default_pictures or news.default_pictures or news.default_multimedia_items%} <div class='small-gallery'> {% for picture in news.default_pictures %} |